rbtree: Use gtk_rbnode_adjust()

Make gtk_rbnode_remove() use it when unlinking the node.

diff --git a/gtk/gtkrbtree.c b/gtk/gtkrbtree.c
index b62a0f3dc19b43e11608d6c2be1ab3ee29b0d250..a09db5a5b2197a18bb70e56b7395fcfe9d106065 100644 (file)
--- a/gtk/gtkrbtree.c
+++ b/gtk/gtkrbtree.c
@@ -1170,30 +1170,8 @@ _gtk_rbtree_remove_node (GtkRBTree *tree,
        y = y->left;
     }
 
-  /* adjust count only beneath tree */
-  for (x = y; x != tree->nil; x = x->parent)
-    {
-      x->count--;
-    }
-
-  /* offsets and total count adjust all the way up through parent trees */
   y_height = GTK_RBNODE_GET_HEIGHT (y);
 
-  tmp_tree = tree;
-  tmp_node = y;
-  while (tmp_tree && tmp_node && tmp_node != tmp_tree->nil)
-    {
-      tmp_node->offset -= (y_height + (y->children?y->children->root->offset:0));
-      _fixup_validation (tmp_tree, tmp_node);
-      _fixup_total_count (tmp_tree, tmp_node);
-      tmp_node = tmp_node->parent;
-      if (tmp_node == tmp_tree->nil)
-       {
-         tmp_node = tmp_tree->parent_node;
-         tmp_tree = tmp_tree->parent_tree;
-       }
-    }
-
   /* x is y's only child, or nil */
   if (y->left != tree->nil)
     x = y->left;
@@ -1216,25 +1194,9 @@ _gtk_rbtree_remove_node (GtkRBTree *tree,
 
   /* We need to clean up the validity of the tree.
    */
-
-  tmp_tree = tree;
-  tmp_node = x;
-  do
-    {
-      /* We skip the first time, iff x is nil */
-      if (tmp_node != tmp_tree->nil)
-       {
-         _fixup_validation (tmp_tree, tmp_node);
-         _fixup_total_count (tmp_tree, tmp_node);
-       }
-      tmp_node = tmp_node->parent;
-      if (tmp_node == tmp_tree->nil)
-       {
-         tmp_node = tmp_tree->parent_node;
-         tmp_tree = tmp_tree->parent_tree;
-       }
-    }
-  while (tmp_tree != NULL);
+  gtk_rbnode_adjust (tree, y,
+                     -1, -1,
+                     - (y_height + (y->children?y->children->root->offset:0)));
 
   if (y != node)
     {